Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add diffusion/diag B for aerosol DA and some other needed changes #2738

Merged
merged 106 commits into from
Aug 29, 2024

Conversation

CoryMartin-NOAA
Copy link
Contributor

@CoryMartin-NOAA CoryMartin-NOAA commented Jun 28, 2024

Description

This PR adds in support for computing files needed for the aerosol analysis B. This includes a new task, aeroanlgenb. This work was performed by both me and @andytangborn

Resolves #2501
Resolves #2737

Please note, I am still using python to create dictionaries for FileHandler. This will not be resolved in this PR but a future PR, an issue #2737 has been created to make note of this.
EDIT: this PR has been added to such that the above is no longer true

Type of change

  • New feature (adds functionality)

Change characteristics

  • Is this a breaking change (a change in existing functionality)? NO
  • Does this change require a documentation update? NO

How has this been tested?

  • Cycled test on Hera

Checklist

  • Any dependent changes have been merged and published
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • New and existing tests pass with my changes
  • I have made corresponding changes to the documentation if necessary

CoryMartin-NOAA and others added 30 commits April 17, 2024 15:50
Added tasks to construct aero_diffparm.yaml from template.
Copy link
Contributor

@WalterKolczynski-NOAA WalterKolczynski-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, missed these the first time. Just method names, following the same reasoning as the other PR.

pass

@logit(logger)
def computeVariance(self) -> None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Python style guidelines say method names should be snake case, not camel case.

Suggested change
def computeVariance(self) -> None:
def compute_variance(self) -> None:

pass

@logit(logger)
def computeDiffusion(self) -> None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def computeDiffusion(self) -> None:
def compute_diffusion(self) -> None:

self.link_jediexe()

@logit(logger)
def interpBackground(self) -> None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def interpBackground(self) -> None:
def interp_background(self) -> None:

@logit(logger)
def execute(self: Analysis) -> None:
def variational(self: Analysis) -> None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Best verb I could come up with here, open to others.

Suggested change
def variational(self: Analysis) -> None:
def var_assimilate(self: Analysis) -> None:

@@ -19,4 +19,4 @@

# Instantiate the aerosol analysis task
AeroAnl = AerosolAnalysis(config)
AeroAnl.execute()
AeroAnl.variational()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AeroAnl.variational()
AeroAnl.var_assimilate()

Comment on lines +24 to +26
AeroB.interpBackground()
AeroB.computeVariance()
AeroB.computeDiffusion()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AeroB.interpBackground()
AeroB.computeVariance()
AeroB.computeDiffusion()
AeroB.interp_background()
AeroB.compute_variance()
AeroB.compute_diffusion()

Copy link
Contributor

@WalterKolczynski-NOAA WalterKolczynski-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon reflection, this PR has been hanging around long enough. Let's try to get it in as-is and we can address the method names later.

@emcbot emcbot added CI-Wcoss2-Passed **Bot use only** CI testing on WCOSS for this PR has completed successfully and removed CI-Wcoss2-Running **Bot use only** CI testing on WCOSS for this PR is in-progress labels Aug 28, 2024
@emcbot
Copy link

emcbot commented Aug 28, 2024

All CI Test Cases Passed on Wcoss2:

Experiment C48_ATM_2d5b369f *** SUCCESS *** at 08/27/24 10:35:17 PM
Experiment C48_S2SW_2d5b369f *** SUCCESS *** at 08/27/24 10:49:10 PM
Experiment C96C48_hybatmDA_2d5b369f *** SUCCESS *** at 08/27/24 11:28:29 PM
Experiment C96C48_hybatmaerosnowDA_2d5b369f *** SUCCESS *** at 08/28/24 12:21:25 AM
Experiment C96_atm3DVar_extended_2d5b369f *** SUCCESS *** at 08/28/24 08:42:32 AM

@WalterKolczynski-NOAA
Copy link
Contributor

@CoryMartin-NOAA Looks like merging Russ's PR created a conflict

@CoryMartin-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA resolved

@WalterKolczynski-NOAA WalterKolczynski-NOAA added CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Hercules-Ready **CM use only** PR is ready for CI testing on Hercules labels Aug 28, 2024
@emcbot emcbot added CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully and removed CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress labels Aug 28, 2024
@emcbot
Copy link

emcbot commented Aug 29, 2024

CI Passed on Hera in Build# 2
Built and ran in directory /scratch1/NCEPDEV/global/CI/2738


Experiment C48_ATM_40c8feb0 Completed 1 Cycles: *SUCCESS* at Wed Aug 28 23:23:56 UTC 2024
Experiment C48mx500_3DVarAOWCDA_40c8feb0 Completed 2 Cycles: *SUCCESS* at Wed Aug 28 23:42:33 UTC 2024
Experiment C96_atm3DVar_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 00:50:20 UTC 2024
Experiment C48_S2SWA_gefs_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 00:50:52 UTC 2024
Experiment C48_S2SW_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 01:02:52 UTC 2024
Experiment C96C48_hybatmDA_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 01:08:58 UTC 2024
Experiment C96C48_ufs_hybatmDA_40c8feb0 Completed 2 Cycles: *SUCCESS* at Thu Aug 29 01:21:22 UTC 2024
Experiment C96C48_hybatmaerosnowDA_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 02:16:17 UTC 2024

@emcbot emcbot added CI-Hercules-Building **Bot use only** CI testing is cloning/building on Hercules CI-Hercules-Running **Bot use only** CI testing on Hercules for this PR is in-progress CI-Hercules-Passed **Bot use only** CI testing on Hercules for this PR has completed successfully and removed CI-Hercules-Ready **CM use only** PR is ready for CI testing on Hercules CI-Hercules-Building **Bot use only** CI testing is cloning/building on Hercules CI-Hercules-Running **Bot use only** CI testing on Hercules for this PR is in-progress labels Aug 29, 2024
@emcbot
Copy link

emcbot commented Aug 29, 2024

CI Passed on Hercules in Build# 1
Built and ran in directory /work2/noaa/stmp/CI/HERCULES/2738


Experiment C48_ATM_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 14:03:04 CDT 2024
Experiment C48_S2SWA_gefs_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 14:58:13 CDT 2024
Experiment C48_S2SW_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 15:03:39 CDT 2024
Experiment C96_atm3DVar_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 15:03:41 CDT 2024
Experiment C96C48_hybatmDA_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 15:03:52 CDT 2024

@WalterKolczynski-NOAA WalterKolczynski-NOAA merged commit 7f160f6 into NOAA-EMC:develop Aug 29, 2024
5 checks passed
DavidHuber-NOAA added a commit to DavidHuber-NOAA/global-workflow that referenced this pull request Aug 30, 2024
* origin/develop:
  Add 3 and 9 hr increment files to IC staging (NOAA-EMC#2876)
  Add diffusion/diag B for aerosol DA and some other needed changes (NOAA-EMC#2738)
  Correct ocean `MOM.res_#` stage copy (NOAA-EMC#2868)
  Support coupling on AWS (NOAA-EMC#2859)
  Add JEDI ATM lgetkf observer and solver jobs (NOAA-EMC#2833)
DavidHuber-NOAA added a commit to DavidHuber-NOAA/global-workflow that referenced this pull request Sep 9, 2024
* origin/develop:
  Create JEDI class (NOAA-EMC#2805)
  Restructure the bufr sounding job    (NOAA-EMC#2853)
  Add an archive task to GEFS system to archive files locally (NOAA-EMC#2816)
  Reenable Orion Cycling Support (NOAA-EMC#2877)
  Eliminate race conditions and remove DATAROOT last in cleanup (NOAA-EMC#2893)
  Update aerosol climatology to 2013-2024 mean (NOAA-EMC#2888)
  Add ability to run CI test C96_atm3DVar.yaml to Gaea-C5 (NOAA-EMC#2885)
  Support global-workflow GEFS C48 on Google Cloud (NOAA-EMC#2861)
  Add 3 and 9 hr increment files to IC staging (NOAA-EMC#2876)
  Add diffusion/diag B for aerosol DA and some other needed changes (NOAA-EMC#2738)
  Correct ocean `MOM.res_#` stage copy (NOAA-EMC#2868)
  Support coupling on AWS (NOAA-EMC#2859)
  Add JEDI ATM lgetkf observer and solver jobs (NOAA-EMC#2833)
  Fix gdas build on Gaea and add Gaea to available CI list (NOAA-EMC#2857)
  Support ATM forecast only on Google (NOAA-EMC#2832)
  Add GEFS C48 support on AWS (NOAA-EMC#2818)
  Update omega calculation (NOAA-EMC#2751)
  Add snow DA update and recentering for the EnKF forecasts (NOAA-EMC#2690)
  support ATM forecast only on Azure (NOAA-EMC#2827)
  Convert staging job to python and yaml (NOAA-EMC#2651)
  Fixed test on UNAVAILBLE in python Rocoto check (NOAA-EMC#2842)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully CI-Hercules-Passed **Bot use only** CI testing on Hercules for this PR has completed successfully CI-Wcoss2-Passed **Bot use only** CI testing on WCOSS for this PR has completed successfully
Projects
None yet
7 participants